Also see change I5a57ecc8 which is another fix for the same
problem.

Bug: 3459274
Change-Id: Ica2bb5b5aa4362d538df3765559d676c1aab4a85