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

Change-Id: I31b99ba3f01e7dec69740697cceaabc4566104fa