Snap for 7343852 from 8a5d7fbdcbd026ae4ba1b2a12f3b97cf9234b846 to sc-mainline-release

Change-Id: Ia21a5dad5ece4aa4e3675074a2498cbbf7d72262