Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD am: 5734a9be97 am: 49c12e965c
am: f75e77d68e

Change-Id: I163915b7ce0f0d12f035eded77667ae9d69c871d