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

Change-Id: Iac9ad5693df97185575e4d620aebf00fd19870fa