Update error message

Change-Id: I94689e5eee5c9c15ca6b9079b658674cd405c1e8
Merge "Update error message" into R1.06