Fix for critical part of bug 929765.

Change-Id: I6ca3b3bc674305011d2469ca1f417a435d030a98
2 files changed