Merge "Merge "Merge "Fixes the wrong error logs for shortcut ranks (false...
Merge "Merge "Merge "Fixes the wrong error logs for shortcut ranks (false alarm)" into rvc-dev am: 6815d60d am: 6bed0a9c" into rvc-d1-dev-plus-aosp am: ea45b9e9" into rvc-qpr-dev-plus-aosp