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

Change-Id: I6bbbf296c09222fa97353321a8d40226dbcefc95