Merge "Follow acronym convention for Companion BLE filter" into oc-dev
am: 81d9230c88

Change-Id: I45fac28b65277448fb5a2ba59121ffeed8a12b15