fix typo

Change-Id: Ieb40257f4c959e1a4377fa4d6c21e21a49f4ad07
Merge remote-tracking branch 'upstream/jellybean' into HEAD