Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73 am: 8b2e3b60 am: 24ee2510 Change-Id: I552d83680487f193ff7d5b752b7b53912d3944f7