Merge "Do HFieldGet first to avoid explicit null check."
am: 9a85f58cd3

* commit '9a85f58cd380d8ad35c481576fa55a9b04917f4e':
  Do HFieldGet first to avoid explicit null check.