am 163df02e: (-s ours) Reconcile with jb-mr1-factory-release - do not merge

* commit '163df02e120b3ac7b9ebc0d1ffce7e50642ee49c':
  Add support of getting factory BDADDR from Controller's non-volatile memory(2/2)