Snap for 9912757 from 99d7c2056631fad1e04e1faa442914afc21c37ee to aml-frc-release

Change-Id: I08bf38c335ccf690b91281f42a4b358c1eb924e6