Merge "Fix Toggle Bluetooth test dialogs" into oc-dev am: 15b1039feb
am: e0842756be

Change-Id: I65b0682c20dc8e57f6329cf63a34725546c0486c