Snap for 9133013 from a564ebbda61e71a4c9af043bf8ba437be43950a2 to tm-qpr2-release

Change-Id: Ib263b11df1c92837e0ff04a30956f3a4e3acc80d