Bug: 135452847 Test: System should not crash Change-Id: I34d088df9f572b4299b71b5260d2ea423689a0fb
mentioned in commit b3975623