Added workaround for #11737 to test

Change-Id: I9541abb5835c6851c3eea0d7567b4a848dc605d0