Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 45ba85e64a

Change-Id: Ic92fc6fdfa92ab65ab888bd4f3feef23cbbeace6