Snap for 9416697 from 71ad23a8db2fcc41e904e45e56c74e230a8e41b7 to tm-qpr2-release

Change-Id: I897166cd644e20bb0fe1dad985ab4c6e89d60104