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

Change-Id: I1c732a5ebd2848547cd80ec9750f005705be9d94