am ba43f7e9: Merge "Revert "Sometimes the application context is null""
am ba43f7e9: Merge "Revert "Sometimes the application context is null""

* commit 'ba43f7e914cd2cb8145ffeb5720aa5e87be48b9b':
  Revert "Sometimes the application context is null"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base