Merge stage-aosp-master into pi-dev-plus-aosp
am: 70ef2bf27c

Change-Id: I2a67568dda5d07c0ef88ef074d6fab616c5713cb