Fix for bug 1342397 commiting on behalf of Sanju Abraham.

Change-Id: Ifa8eaf47866ecb653edcc99e91a3e272e80d7d43
Merge "Fix for bug 1342397 commiting on behalf of Sanju Abraham."