Merge "[AWARE] Update CTS for (new) Aware Location Mode behavior"