Merge "migration user setting to VM notificationchannel" into oc-dev am: 0383149f63
am: bac4af8d97

Change-Id: I72a0d9e061b54d9f4b160bcaa827260d925328ef