Fix for Bug 1367413

Change-Id: I30c3b191187446c7a889d4c91b9032a38f12aa10
Merge "Fix for Bug 1367413"