original fix from commit 93ffa7579c
copied to our code.
Also fixed a whitespace issue in the same code block.
Change-Id: I6396803659c6880cde4f2b2ef08efab5721c215d
14 KiB
14 KiB