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

Change-Id: I1fdfe4bb42e0feb71cfee3334fcead3098aa2e10