Merge "Dynamic args complete removal." into rvc-dev am: a7b10f5623 am: 4604a9bbe7 am: 082322b5bd am: 22c5d09f92

Change-Id: Iab9be6102f8335f159dcc9f66efb6c19d88c6b8e