Merge "servicemanager: hard failure for missing context" am: fcb357810a

Change-Id: Ic66188cde527095b1de4444ec3e872c8a49b48d8