Merge "Fix function setting failed in Developer options" into rvc-dev am: 1324df73 am: 8b2e3b60 am: 27a983b2 Change-Id: Iba90c384496e20672aacbb329e2977890ba28266