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

Change-Id: I140c9262c9b616c1770f3feffa6aa88580d19944