Merge "Fix CME crashes" into rvc-dev am: 34d90f4609 am: 044e426b00 am: d4485d99d7 am: 4a1a15dcc5
Change-Id: I6d3ae252ddb9f913f8e5f348e9a188c54c4e0231
This commit is contained in: