[automerger skipped] Use vector to pass around keys
am: a7a29fab40 -s ours
am skip reason: change_id I4c05acb15b77959f2bf89abbdc325904fffb497a with SHA1 f5953d7ace is in history

Change-Id: I771e751826c4aa14da68ce47e41d8a70a113d73e