am 02ebcdb9: Merge "Revive Null check for backward compatibility." into mnc-dev
am 02ebcdb9: Merge "Revive Null check for backward compatibility." into mnc-dev

* commit '02ebcdb91101020f1897d50ed6d2e7ad048a5cec':
  Revive Null check for backward compatibility.

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