Snap for 9167942 from 44352af40b379572975dd356c73a32dfd7e90660 to tm-qpr2-release

Change-Id: Iaf237237a9ff0d1cbd8e953be21b5d70eba49b4c