Merge "Add UNSUPPORTED to health 2.1 types" am: 6a4ab26005 am: 49a258dd49 am: 0451d28dad

Change-Id: I711b7b1ed49618ea1abb7b92ca85ebbcc2b50b35