Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: ecea1bfeae
am: 00f28dbb60

Change-Id: I9ffe228d5914b08c8581cfa583f7824d76edfdb6