Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e00e30c98e am: 3ba07129c8
am: 897bae5377

Change-Id: I2436876e1a086962c8ad35c14735fa49a41d0069