Merge branch tm-qpr1-release

Change-Id: I2cba5b3d2a36a99ee036f4925b00e3f4d9be3b61