DO NOT MERGE Fix NPE

cherry-pick of https://android-git.corp.google.com/g/183950
1 file changed