Merge "codec2: add ION usage mapper to the sample service" am: a6f7d915bb
am: 9350e40427

Change-Id: I5a15b815572e10630cafe262057c34b7fd4e6f82