Merge "Context.getSystemService() shouldn't return null..." into rvc-dev am: 52c24bdedf am: 30a6b785ea

Change-Id: Id9ccb43d00fb05cf45013c96b71f1d68f5b7cc9f