Merge branch tm-qpr1-release

Change-Id: I5ffca5adf21c8c260a1206872ba464af01023769