Merge "Assert getService does not return nullptr" into oc-dr1-dev
am: 050c563f02

Change-Id: I16ec7e910d86e41fa04517f041f9c9d46ae4c45d