Merge "Merge "Change error and none messages" into rvc-dev am: 695deeae89 am: 76f6b29251 am: b0922843c5" into rvc-qpr-dev-plus-aosp