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

Change-Id: If59c0b12454c9c31d26551fb2f25aa7a6906d0bc