DO NOT MERGE temp fix for NPE

Bug #3508479

Change-Id: I25c8aec546e2fe13c954fe362a4231e05039e607
1 file changed