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

Change-Id: I09e8131e06795b6c071ff68df33994386b5908dc