Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 51309e16a2

Change-Id: Ifc3a5631c02f702ea262d699ea588cc21daf8942