Snap for 7624767 from e1988f37c4745c26c2f67d529e312a90f9eac790 to sc-mainline-release

Change-Id: Ice57c2b8441476c618120c05111ad1c4bbc86cbc