Merge "Correct Error reported to logcat when Plugin fails to load" into tm-qpr-dev