Snap for 11611254 from 6d858ee3536d192934c6f1186275b4714e56ce12 to aml-frc-release

Change-Id: I8da7b997d13650a105f78c4e52684b793adaeede