Merge "[AWARE] Fix unit tests" into oc-dev am: 6fd057cf58  -s ours
am: bf0022d192  -s ours

Change-Id: I8e4751dc0b3696d5755814389abb0dfded3bb042