Merge "Stop hardcoding a keypath in OTA generator"