Merge "Fix test that was failing due to a cast error." am: e5a8e89d86
am: 51b0de1c54

Change-Id: I1225ec264aa87ee9868fa81407fdf1cfb8c0f738