Merge stage-aosp-master into pi-dev-plus-aosp
am: 3f9af3b5e4

Change-Id: I0ced979eaa1b88d2ee8dd86e2e91b87911fc3f1b