Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 0e618b2c64
am: 549fe98ac8

Change-Id: I182157b243bac0bc26f8fdcf55f820accecd12ba