aml_go_odp_330912000
Snap for 8680285 from cc713f4b45b48829a0028d20858b9c4292153549 to mainline-go-odp-release

Change-Id: I7d7edae52c658543cc10af335be5df9b98779ba9