am 4754f401: Merge "Avoid NullPointerException in getHandler()"

* commit '4754f401a912305e1ceec04b62ad9b9f7d3c2ff6':
  Avoid NullPointerException in getHandler()