Merge "Update app level fields when misc channel is updated" into oc-dev am: 567947d75d
am: cb01f85aba

Change-Id: I943ed0c1abbf0c5fbf37c83eb0cb7d37dac3a35b