Merge "Fix broken test cast" into rvc-dev am: 4857993641

Change-Id: I757403f214c9d9591860faf162588e27d9023fb6