[automerger skipped] Merge changes from topic "sysuibp" into pi-dev-plus-aosp
am: f694989776  -s ours

Change-Id: Ifee8c2f55697226c6c0fccb8d2d79956ecb271df