Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom