2ac0190bfa
Also, there is a need to bump golang version to 1.16.x. Change-Id: I453b04e97b556033e3f30a7406ccb6e4870f2d3c