Merge "OTA: make lp_metadata write more atomic"