Merge "[AWARE] Data-path cipher API correction"
am: 4ba6a7d3dd

Change-Id: Ie9b3a5be561bd2f7db0218d4d5914527f1384c47