Merge "Don't start intelligence services that are not provided by the OEM." into qt-qpr1-dev
am: 4e8070890a

Change-Id: Iba93086430c52c23828d0899b1440b1724e14d81