Merge stage-aosp-master into pi-dev-plus-aosp
am: f9d606f553

Change-Id: If544b60c25c8935238247c44ff0ee4ac6ef6d87c