am e34c80bc: am 614c653b: am 1fdb5100: Merge "Handle null values in registerService" into lmp-dev

* commit 'e34c80bc53c04efebf552e16e1f7ee30bd09c141':
  Handle null values in registerService