Merge "[conflict] Merge "Fix mSession NULL dereference" am: 64a5e99011 am: e1391b7d67 am: 2f92d85e50" into udc-dev