Snap for 8474975 from 04921b8ee3283102e95037f2510ceab579cf6e8a to tm-qpr1-release

Change-Id: If57f9eb8c82f53016b940e57bf54954654dd734f