Fill *_id information for client when using static accounts

Related-Prod: PRODX-18763
Change-Id: Ie6f4092e07bdf28af6cfcfd0fe37645dd1b794c4
(cherry picked from commit aa439722f31055c3e1bdfa833060cd4edc8065c9)
(cherry picked from commit 4d5b1115dd748a02f8bdb04809407d73ff8090e0)
1 file changed