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

Change-Id: I7d12468b3df538aeb1a37152c57a8b2d12eb3327