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

Change-Id: I51fd0ba6886aa440388c53976633b4de10905b35