Merge AOSP master into stage-aosp-master.

Change-Id: Iae52b0dfde91d1269df4f067961f3f344793c52b