Merge "Make num-integer available to product and vendor am: ebdc3400e6 am: bba013dc0c am: 677faa059f am: 4f1a46ed44 am: 386bdbc7f8"