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

Change-Id: Idec33193ec9376b7bfeeb71442bb780231d8fc16