Merge "Move adb_keys to product partition" into main