Merge "Fix #37305009 : Beam crash in secondary users" into oc-dev
am: 68bfea8a5d

Change-Id: Ib449f03ac48eb534c75d539ce38f295444098cb4