am 58524b2a: am e7e92381: Merge "Register DDM handlers at the beginning of main method."

* commit '58524b2aa620ae1ea709ae48b8b8598548cc7202':
  Register DDM handlers at the beginning of main method.