am 267b6029: am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev
am 267b6029: am ed8cdbb7: Merge "Fix CTS failure due to invalid EAP update" into jb-mr2-dev

* commit '267b60295098ae27be651991bd1b50bf6db69032':
  Fix CTS failure due to invalid EAP update

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