Merge "Fix some config issues with sysui" into oc-dr1-dev
am: f636e3fb52

Change-Id: Ib9b38c8eb8c6452e7d12f2ced2b499292c000277