Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73de

Change-Id: I332f63ab24c79a0b37518e5b9feb8971706f3a2b