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

Change-Id: I16cbc727fea588eaa489c0438f528ea76c405dc2