Merge changes from topic "vts-rf" into rvc-dev am: 0f06a9fdf5

Change-Id: I70d947c9472104dc69fb01ad093a2b169642e6d6