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

Change-Id: I622d4fa769fd3a2f40614836fa09b21d99fa96b3