Yet another attempt to fix (issue 6282761)

Change-Id: Iabb0dd8e59e566ddef71d4aa7aa684f52d06b3b3
2 files changed