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

Change-Id: Icb1600c5d3f05a7a31e9a891461f4c76fd0d884c