Merge "Fixes the wrong error logs for shortcut ranks (false alarm)" into rvc-dev am: 6815d60d0a am: 6bed0a9cee

Change-Id: Ibb6b7196df13bab9a0b21248e5bcb7a97bf40f30