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

Change-Id: I266a19ae46cc4af13fb888dc8ae80ba4340bb331