Merge stage-aosp-master into pi-dev-plus-aosp
am: 68c9bded44

Change-Id: Ief0afcb56782670e94a4cf290295a523b98f1254