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