Merge "[AWARE] Fix unit tests"
am: de8e09409b

Change-Id: I563dc61839664a7b51c1fe44283f7dd18217b012