Snap for 7653618 from 38eb57dddf2482c271101ccffec123b009c438d4 to sc-mainline-release

Change-Id: Ie48aae40b01bc95cfcb09d03467dd9f4c0532589