(cherry-picked from AOSP master 83c5612e69fa05610baf4f4d237fe0995a79cde5) Bug: 18035729 (cherry picked from commit 643b5df2) Change-Id: I14edee7c7cb996bc388d89b4c5274db2caf91004