uplink stopped using zap, hence some of the private methods needed to be changed. Change-Id: Iac1fae45a40cd3f1649b9f672bf8c250344986d5
Change-Id: I8b12606a96b712050bf40d587664fb1b2c578fbc