Prevent NPE in new API.

bug:8455284
Change-Id: I26ecbd024d1fe001f3af792c4e66409b2968c7ec
1 file changed