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

Change-Id: I9a1dbc2f382562fb8ced63fd70f1a5e1674285f0