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

Change-Id: I2fdb7eca68377b0bcdb658c508b0d44d09c13975