Snap for 8909196 from 6e48a1e5797a91a170ad898239c788b03e39c039 to tm-qpr1-release

Change-Id: I75048cca993434e08832e99d25d0d7dd93444898