Merge branch tm-qpr1-release

Change-Id: Id67358b0f64d83a15bd74269afaac6582eea95c9