aml_med_341312300
Snap for 10453563 from dfb0b6e960c10be916541250ac2f81845a125538 to mainline-media-release

Change-Id: I37dd57e988abd196f118ed87b31ea2c771d02b07