Merge branch tm-qpr1-release

Change-Id: Ie20108a6e0ad051a743ac8181c88a356ae1aba19