Snap for 9127121 from 293041cac77386d5a782de721a1ee63a34556965 to tm-qpr1-release

Change-Id: I7327923aa6952c485af578121a177262f3281432