am 1b8c33c6: Merge "Forward compatibility fixes"
am 1b8c33c6: Merge "Forward compatibility fixes"

* commit '1b8c33c614a1a67fadf3f32758ac781e05dcb8aa':
  Forward compatibility fixes

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