Merge stage-aosp-master into pi-dev-plus-aosp
am: 5467e547a3

Change-Id: I6d49b221633d801c4ed2d15f2d6978b25142a473