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

Change-Id: I0eaa63c647a0941c735f58a4f0c2a149de80d051