[automerger skipped] Merge "Fix test that was failing due to a cast error." am: e5a8e89d86 am: 51b0de1c54
am: 5b0c9e8de2  -s ours

Change-Id: I17783e4841d55bd93172bd54ba810c3e453720f1