Merge "Fix sysui depending on slow bt calls" into oc-dev am: 02d5b79cf6
am: 304f3a74be

Change-Id: I2d863f2db0576b04fbbcec0c81fffb354833af1c