Merge changes from topics "parcel_uuid_and_fd_native", "bluetooth_socket_manager_native" am: b2bde067 am: 64a1fbb8 Change-Id: I8e480c1ca3c1cdbd61e2b854bf4b42d1e81087ae