aml_go_med_330913000
Snap for 8817865 from a0c2d358f185a542cc58ad18fb4063c870804b84 to mainline-go-media-release

Change-Id: I2a4993c9eaec7379ede5ad4dbe583f2a3b946b9d