Snap for 9103983 from 9cf1df8b00e7c253fe62ba569879b53036f6cbf6 to tm-qpr1-release

Change-Id: I4032be26f7d46cba71060e11bc11f289423e9821