Fix problem w/ multiple accounts and parentKey setup

* Add unit test that specifically tests for this the failure in
  the referenced bug

Bug: 4305832
Change-Id: I83cd4710d6d20c3fc108d6df3e1ddfbef696cd9b
3 files changed