Merge branch tm-release

Change-Id: Ib20842070f23634a3578a6d1248dd482a1172cfe