Snap for 7205268 from 0d9d9c82492f77d058406168f2ee1efd24b3f78d to sc-release

Change-Id: Icdc819125e8f1b45c52f720f0606e85c12642f8c