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

Change-Id: I7944fb08e48f38cc300097492cfe1b6524cb6cd6