Merge "Allow system packages to change path during OTA." into main