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

Change-Id: Idc3fac06db22050b0632f36e6403ab1467affafd