Merge stage-aosp-master into pi-dev-plus-aosp
am: 93f043db42

Change-Id: Ib754afeec7d93105074a9db7149aa13a84cd4c42