Bug: 16848366 (cherry picked from commit bc678bba) Change-Id: Idf75288026a837b95f4619acadec57e38bacbd7b