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

Change-Id: I7c9e7311269cd9acff74475e1140b6583c266660