Android: Merge remote-tracking branch 'remotes/aosp/upstream-gh-pages' am: 0622f2c7dc am: 641d798005
am: 0ad6309bb5

Change-Id: Idb749b4479cc7049749ef3bc1660d2dce2b51d1d