Merge changes from topic "ike-cts-mts" into rvc-dev am: 64db03e386

Change-Id: Ia3e53f83dfb1544aa3f13034349c4f20ca7fa604