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

Change-Id: I95d798a2c78dad57ed0d73151cc81d49b4e212af