Snap for 8414339 from 7b3871ad72f46e0bbc7877261b183cc6fe805934 to tm-qpr1-release

Change-Id: I06fd5bb4cc56191adc8ea601e2e3875d344c6c68