Merge stage-aosp-master into pi-dev-plus-aosp
am: 5fefc1024c

Change-Id: I8e2c25ddfebb54b82cc0a3f02f5ab5f7e76062c5