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

Change-Id: I65783cdecf774fb26099ef4db70b21d81782fdf2