Merge stage-aosp-master into pi-dev-plus-aosp
am: 86499fce24

Change-Id: Ifecc841bb720b54260313a810f36140fdbdda6df