Merge "Dynamic args complete removal." into rvc-dev am: a7b10f56 am: 4604a9bb am: 3d880fa4 am: af969bc5 Change-Id: I477b04e9874b8889f8905174db4da0241658171c