Fix logic for building field_list in update

Bug 1194520

Change-Id: Ie3ea7b77dc9a4f712e3e838c20c062db1b2d9faa
Fixing some typos found during translation

Change-Id: Ic0e9ea6aa84c30996b29dce3bfa06b443e9adcc4
Merge "Fixing some typos found during translation"
Merge "Fix logic for building field_list in update"