tree 6e53cf86e471f5b2b622fb0a2bdbefe71d8c2fb3
parent 02fa41b5f4cdd024e1528cd7ca5a103de3212718
author Daisuke Miyakawa <dmiyakawa@google.com> 1320366994 -0700
committer Daisuke Miyakawa <dmiyakawa@google.com> 1320368624 -0700

Re-introduce workaround for issue 3090362

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

Bug: 5508989
Change-Id: Ida37ad9d0edf05538fdd9506571c0661463394d6