Merge branch tm-release

Change-Id: Ia5b36255b8ef8aac224d24396a5ccf1e09f3c708