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

Change-Id: If712284337f15a103ad05a607088cd9ca1fe71d9