Snap for 8509668 from 59c67c54000ec24190fac22b01bcbe5a52dc8732 to tm-qpr1-release

Change-Id: I4ea9a85e882bd122e4359a462532795008eca79b