The problem itself was fixed by commit
2ad50c9a.

Change-Id: Ie7f0781e1f5a4d6c5297882a5f64a68b85558515
(cherry picked from commit 6106fea5)