Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ed9d1ca52d am: b80ef47305
am: 16a584a67a

Change-Id: Ib67cf630bc22230a14273c0133e5a84b3c9ffa1d