Merge "Lock relevant fields on channel update" into oc-dev
am: 6307ac52e5

Change-Id: I7f47872b2d166353365517e7407cda43666ae70c