Merge "Don't double-wrap with gomacc" am: b7a12806b1 am: 70683c3ccf
am: 5c16219854

Change-Id: I5c90cd78c4644a93d95158063577964f55da02ec