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