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

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