am 6a9b20d7: (-s ours) am d64e6d7e: Merge "DO NOT MERGE: Fix undefined arg eval order...