Merge stage-aosp-master into pi-dev-plus-aosp
am: 688e817f78

Change-Id: Ia60bdc774a6c211658b7421bb770c2ad81fc7608