Merge "Add discoverable footer preference string when bluetooth is off" into pi-dev am: 4017944d17
am: fe323a7359

Change-Id: I97fe217535a8d9f8da756505c7b60662202a3867