Merge "Null check while removing suspensions" into rvc-dev am: 4c65d2cbee am: b3c8d07625 am: 9d02a701f9 am: 2d048351d0
Original change: undetermined Change-Id: I61c54a9675111bbba6b2215b4f37badf840e6141
This commit is contained in: