Merge "Fix error message strings" am: 67862237e9 am: ab1d052155 am: 66ad753bd8
am: 788fddbf19

Change-Id: I170931a2f80a5099c0b4103c68341f954e76185e