aml_go_med_330913000
Snap for 8358640 from af971b5524a392944a8fd1423b1860f3ab2919ec to mainline-go-media-release

Change-Id: I09c9fef01e9538c71067a2d02630d26ff6fd251e