Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623

Change-Id: Ia1586861dc98bdbf73570b6230960643c1951877