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

Change-Id: I38cc7c64491eafc2d9d72100aa4364079bd425a3