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

Change-Id: I724a5538a6333761b2d48a286df6245170d33732