Merge "Remove code related to Health Device Profile"