Snap for 9137459 from 61b581f1ffed15f7eb45a1091c029ef9db75f4bc to tm-qpr2-release

Change-Id: I1ddcf6bbcc25aab483d7113e7ae7d0b88862495e