Snap for 11451325 from 75616d68269de67ef95b919e1b20a4c697d75552 to aml-frc-release

Change-Id: Ibe0f7bc22a16023b19740eb913b36082e92f305b