[automerger skipped] DO NOT MERGE Make fixes to make sysui more customizable...
[automerger skipped] DO NOT MERGE Make fixes to make sysui more customizable am: 731dafbd am: d39bea40 -s ours
am skip reason: subject contains skip directive
Change-Id: I2a174cd1649439873aad4947517eaec28b658117