Merge "servicemanager: hard failure for missing context" am: fcb357810a am: 6053d8370a am: d9c83896bc am: a9b86b8aa5 am: 717f03624e

Change-Id: I4c15c2c9007ff8e8918d8150d18d122536adb579