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

Change-Id: I6884876cb0cf1848b7bac407e9ce73dd3c643437