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

Change-Id: I9a27750cd7681126dc0b7023e6fe93f533fa11e0