am 1ef41605: (-s ours) am d64f4a98: DO NOT MERGE fix null check

Merge commit '1ef41605bbde97fb3979003a652fd365a0d034aa'

* commit '1ef41605bbde97fb3979003a652fd365a0d034aa':
  DO NOT MERGE fix null check