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

Change-Id: Iebfb0523c430fd73cb316e1c0835f6d45e582440