Merge stage-aosp-master into pi-dev-plus-aosp
am: 3878ab6dcc

Change-Id: I16ba4ce4f943b96d5a5478eb7f1be2aef3f790a6