Merge "Add config flag for CallingAccountSelector"
am: 599205c0bf

Change-Id: Iad508dada68dc18fd6e2c62585bcc20f8a9390c1