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

Change-Id: I75d8cddbbaef96a12fc7ed59e5c32b54423391bc