Hot fix for hasChanges function causing tests failure

Change-Id: Ib71699004a3660373b4de2364884bc70de7766d7
Merge "Hot fix for hasChanges function causing tests failure"