am 53ad53a4: Merge "Fix 5213837"
am 53ad53a4: Merge "Fix 5213837"

* commit '53ad53a4a3279dc19e93c254ec387d222ce18656':
  Fix 5213837

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