Merge "Remove suppression of fixed test."
am: 240f32428c

Change-Id: Ib48558c05ed48ce20d7eaa5b5abd02fb3dd649bc