Merge "Changing importance should record user locked field." into oc-dev
am: f61985f02e

Change-Id: I8e53594947fd6bf1439da9c5d70e86cff111983b