Merge "Handle null values in registerService" into lmp-dev