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

Change-Id: Iea285792e32f3b02d116400045621e1b78729a50