Snap for 9447015 from 7b6a82d4f4a77c48c33812b244dc1cd2669611e2 to tm-qpr2-release

Change-Id: I8e63ca6aaad86ccb8dd1c10bcf94058cfeb55da6