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

Change-Id: I4c571d47fce5087cc0bf958bf278342c9df85d53