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

Change-Id: I041bdcc7d533109749df3b2c07597c098ecd8821