Merge "Use initial value on save when value didn't change." into oc-dev
am: 2e723982d5

Change-Id: Ie8196727744de7b8a5d51fe671bca8c984ae321d