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

Change-Id: I83df0d4bf3368075d46e6fe439d58491c8812cdb