(cherry picked from commit 48be71d0) Bug: 17784968 Change-Id: Iac7732fb4f7fe42977cb9f62472bb636e17e5232