Reword failure message

Change-Id: I8cff7c61bb45b7e4109f113aeb4267b2bb19850f
Merge "Reword failure message" into production