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

Change-Id: I0e9712c53f534a1321681771f3d6bd72aa5f7cef