Merge "Remove code related to Health Device Profile" am: 91bffc4c45
am: fa863197b5

Change-Id: Iae2921da85b0155efd2ea8159ba64edba7841a1d