Merge changes Idadf8487,I84d87024

* changes:
  Resolve bluetooth hidden API usages
  Use allowed system value