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

Change-Id: I7c551c04c69e56d1e074b962d14b5990c045b55b