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

Change-Id: I794a40787c56048b1b0af502470621ff799a1eef