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

Change-Id: Ib87b6e44adb3feec40eafabca28285d9982319b3