Merge "Fix NearbyDeviceParcelable read and write bug" into tm-dev