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

Change-Id: I9c6b5588bb7a561b45bee0f8aac4ba9dbb047c3f