Merge remote-tracking branch 'aosp/upstream-master' into HEAD
am: f13a30b95a

Change-Id: I4257ad915f699c3ab75879f829223232c75ebc58