Merge "Merge "Mark tests part of the device-tests platinum set" into main am: 0ffcc2761a am: 1f10a0a6ea" into main