Snap for 8512216 from 4e1790e8e6611a7bb3b633ee5045351bb6de60b5 to tm-frc-art-release

Change-Id: I309c32e85a3bc7331da99e47242b9b46f9877f85