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

Change-Id: I85c6f3dab12a1e992d02b339003607c0c4f3eaed