Merge remote-tracking branch 'android-aosp/upstream' into HEAD Bug: 122085007 Change-Id: I45892a854e13d5db692b02343ec368eeb22efaae