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