Merge "Introduce Authentication Failure reason codes" am: e23b2c6c59
am: 1fc10c0729

Change-Id: I0ec86c921ce418230b95f462ba70dce6d7b1d3c0