Snap for 9531772 from be4c50f0816e6bb48889cc9eb30ef18a18f763f4 to tm-qpr3-release

Change-Id: I6f2127caeb7d2bead6ceab81a45bb5a804863ba4