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

Change-Id: I28ab527fb1e621f506a40bbb9f3d2fbc72af83a7