Merge "Change unnecessary List usage in TRM to Set" into rvc-dev am: 9dd3bb19 am: a37da3be am: a19f247b Change-Id: If782ed0c7fe6631e6f38f4c0b72f49c114bca137