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

Change-Id: Iee24660807fdd80b484d25614ce69d1fe8eb8d7e