Merge "Add UNSUPPORTED to health 2.1 types"