Moved together code that updates records after default data changed and code that called during data pulling. Removed unnecessary code. Part of bug 1260696 Change-Id: Ic9b52f84fbf0237669e920541524c4e3e62f09d1