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

Change-Id: I7344a24ea8c9f68907d4537efbdcfb310170bdb0