Merge stage-aosp-master into pi-dev-plus-aosp
am: 3427d6fc6a

Change-Id: I4568f81fdeda12ce5c3da86133d42f9b7de7a8b0