Snap for 11946301 from 778aec0ed54cee914565c63a74c4f1444f060ebc to aml-frc-release

Change-Id: Ia1c13312024ab77ae2814720cb5a3ac8b54d8148