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

Change-Id: If250b772445628e26fd73d0c81f31ea89e74f7fa