Merge "Dynamic args complete removal." into rvc-dev am: a7b10f56 am: dcf91316 am: f97e8eeb am: cf9e878c Change-Id: I080bd5ef570e1cc10fe6fddd5ee2d12d6732eb92