Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: e082cdb5 am: bc8e09d1 am: 02642ff5 am: 82c636b5 Change-Id: I1613f7afaefb8d42987582c227a097fd944ad9ad