Merge pull request #48 from hlopko:fix_gold

PiperOrigin-RevId: 278581858
Change-Id: Id8791b4b1405f5210cc60714ed8d77feddc800dd