Merge "Cleanup ReadArgs & ReadValueArgs usage" am: a9b252887c am: 88fc75ee54
am: 0b6085a341

Change-Id: I9b76ca015f94677775cc8dd75b755dd4b226183d