resolve merge conflicts of 7bf98aa8a0
to pi-dev-plus-aosp
am: cf5c9907f5
Change-Id: If24a86438384bb89c47711ea68de2fd812f139bb
gugelfrei
commit
6ace837b7e