Snap for 8414339 from c7fe5073dc11347c2da7808ffbb47dbe8975e7ab to tm-qpr1-release

Change-Id: Id2b0f09d3af92b56bf809d742b6e8a857c7cebb3