Properly parse out underscored parameters

Bug: 60947
Change-Id: Ib1cc601b436b791ebfa91c08a634c5e77de409c2