Merge "[AWARE] Fix unit tests" am: de8e09409b am: c24d7f781a
am: 7060ae081b

Change-Id: I7e90e4c0853457fa49335a48b20d74c3afb9ba1b