Merge "Show class name in error message" into rvc-dev am: dee20d12dc

Change-Id: I1e1b400b277a530635b2b7a480526c3f740b9bf2