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

Change-Id: I1f0ef1630b3a0bfc223612e6ae3aef20d80c604f