Merge "Set default for controls as enabled." into rvc-dev am: c6616838c3

Change-Id: Iaea61aab1ce03ec398812e8cca18187995929672