Exposing the failure message to the user

Closes-Bug: 1400527
Change-Id: I18d7de4014912e9fbd1f82fb620d66e402d83b43
Merge "Exposing the failure message to the user"