Snap for 9752887 from c2286a317e15fba7025c4c6e2059821187d91da6 to tm-qpr3-release

Change-Id: Ie93123324160a6c843b305739958b521a9b13f97