Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 63fd9cc1fc

Change-Id: I800cb64d4413f38804f94db48340c2553b893ece