Re-introduce workaround for issue 3090362

This is originally I790da2e1ad1a37130ceaa2bd6cdb7cd779a5925c,
which happened to be ignored during auto-merge.

Bug: 5508989
Change-Id: Ida37ad9d0edf05538fdd9506571c0661463394d6
1 file changed