Merge "power: fg-util: Wait for soc_update completion upon timeout"