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

Change-Id: I4a592d1b9034ed26c3ee039ad19dfd6acff43b84