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

Change-Id: I16d9887f2c82cdcff3dde282bd129232d456dc5a