Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 47d4c9ba5a am: 662bce0572 am: 09bac87fe5
am: 7a8860406c

Change-Id: Ifb7f9c4e39bcc959389e408c65680d11216ab496