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

Change-Id: Icb0bd3bb0a866fb16a7f5ea62c91fad854418b0c