Merge stage-aosp-master into pi-dev-plus-aosp
am: 23be09c3b6

Change-Id: I57f76657a261627eea38227fe254db7f18bb5aff