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

Change-Id: I778b023dfa65b0e4a8ab681c77a6a98c48184e93