Fix NPE Fixes: 296380464 Test: N/A Change-Id: Icfacdc1dfb85de14bb207abf0e30823c4727c0e2 Merged-In: Icfacdc1dfb85de14bb207abf0e30823c4727c0e2 (cherry picked from commit b884d90e29c838447a805fd721b5ccee40104b14)