Merge "[AWARE] Add unit test - fix hashing bug" into qt-dev
am: 6d98837eb6

Change-Id: I86b8cf8745dfb8566c8e39c5f022e829eb90faf7