Merge branch tm-release

Change-Id: I86e139734c0d7cb86670e9a5ed137b7d01b2c22e