Suppress Clang warning: comparing this with NULL.

BUG: 17356808
Change-Id: I87c7f400b4b9d8d55118915cec6b69a7155e44a6
Merge "Suppress Clang warning: comparing this with NULL."