Snap for 9929149 from 04a038456b9b53c18621c95add857a044a2a4e65 to tm-qpr3-release

Change-Id: I37bb19cae036ceb66f69ad254a972e7f75333dba