Snap for 7647318 from 0b44d365c55e076f58a5dfa5a2a595de9d4345ab to sc-mainline-release

Change-Id: Ica12c4e845d83d672b3ad7e6d4fd7388f2a71ea3