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

Change-Id: I53b320daa27753f6830549ea42a49f302d2f319d