Merge "Fixed bug due to not updating TC information (with regression test)" into oc-dev
am: ef414852c6

Change-Id: I415fa742a164309debf98dae77170131d8c57934