Merge stage-aosp-master into pi-dev-plus-aosp
am: 3279f7e640

Change-Id: I12fbf8828ffb6805ba2188791905832baf96e753