Snap for 7214043 from beeee28da89e24a53b24c24c8e6e1f4e1a216b3b to r-keystone-qcom-release

Change-Id: I315e41283489fe5ed319dfa4834eb7edae4b94b7