Snap for 9541236 from 6df82fd8ea2188a811038fca11098f4f79f2f832 to tm-qpr3-release

Change-Id: Id1566ae49929d0f3755d48b6bf73fd25439c55ed