Bacon : Add proximity check support

Change-Id: I7c24da09b94ce6581f63e76c17f38a73afa4a996
Merge remote-tracking branch 'cm/cm-11.0' into HEAD