Merge "Rectify updateFromImpl to handle edge cases better."