Initial merge from 'aosp/upstream-master' am: ef2f9b5c46 am: 07f9bff504
am: aa329ec328

Change-Id: I4c8dfbf23bdfab5ad6f6da4d8e144b8cef4b1277