Merge "Fix error message strings" am: 67862237e9
am: ab1d052155

Change-Id: Ia69f3161e4a00306f85a622f0a9aae3c6e12faf2