Snap for 9509315 from 3360760531e042d83b82643769af8dc2e464fe8e to tm-qpr3-release

Change-Id: I95c1ac4d42c0a04d11967fea3edee82bd23ee1d2