Guard against NPE am: 663cc934d9 am: 68e09db264 am: a4a0288895 am: 3c30b2a6cb am: 4764c6efda
Change-Id: I3417c1f611a088b0dc3a2b12fa52004b0b975c35
This commit is contained in: