Merge "Remove unnecessary old code from test" into rvc-dev am: 47061340 am: 83c820f7 am: d5f7ad48 Change-Id: I596907273517f27849aeaff74393916ce68bcadf