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

Change-Id: I1b582b63e61f260aa0bf238703c396a65dc9bfa0