Merge changes from topic "propagate_eap_failure" into pi-dev
am: 52c702a3f7

Change-Id: If2d3e009c2bb9bc4637a4ba88810f2c99eae32c7