Merge stage-aosp-master into pi-dev-plus-aosp
am: 489f8b7369

Change-Id: Ic4c1f6d74013bf8252e1bea3fdd836881b8982fe