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

Change-Id: Ib477851b899958a60378e36ae710e3fc49182e15