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

Change-Id: Ib82bfb34db0d685d0fb3ca750511a74c586797f2