am f463b45d: Merge "Fix Possible NPE"

* commit 'f463b45d8e0f6603446496b38aaf45db7e4bb5dd':
  Fix Possible NPE