[automerger skipped] Convert sysui to bp
am: 9c635580a7  -s ours

Change-Id: I61ca99c0c845a2ed9bfcb39459faa6c143e2b8cd