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