Fix for CANARY-8.

Change-Id: I3349e64f4d5406454a4a3b101d33c5d04b9fc8d0