Fix MRN-742

Update storage data if we decided to go back and change previosly defined value

Change-Id: Ic76ac80ec933f49bf2795c634a42902879e6a269
Merge "Fix MRN-742"