[automerger skipped] Make writeKeyValuePairs accept Nullable args am:...
[automerger skipped] Make writeKeyValuePairs accept Nullable args am: 17c204de am: d1ad195b am: de3e727b -s ours
am skip reason: Change-Id Ic1788f65e8c7f837d6800d59c186519a82882bf7 with SHA-1 996afa63 is in history
Change-Id: I3209712710ee21dcc3deee2171e2cfcac4b90dbe