Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623 am: 4604a9bbe7 am: 3d880fa4f5

Change-Id: Iebb6a316b75500708f84bc7286b11dd082b2be79