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

Change-Id: I2d2f9a569dff928346c338679646f69cd71c9367