Fixes: 38004370 Test: Ensure no more crash described in the bug. Change-Id: I9c8266d545eff337760bf875cedfe90fc15e4b7c