Merge changes I8d3b81a5,I36a6c9f1

* changes:
  Implement parcelable for UWB types
  Implement UWB Address