Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73 am: ea62bf63 am: 6f47c002 Change-Id: Ica9db2d8bbeed09ad3b254aa9ab9833efde2abc7