Merge "[AWARE] CTS for Aware data-path creation"
am: 8ee5d70b27

Change-Id: Ia9e4190416c8a93a62678e32d59daf9602da748f