Merge "Null check while removing suspensions" into rvc-dev am: 4c65d2cbee am: b3c8d07625 am: 7c82365bc9 am: 1d3d4af2f5
Original change: undetermined Change-Id: Id086a407ea78c674a1917759150b477d13e71be5
This commit is contained in: