Merge "DCB whitelist shortcode for user association" am: b17d1962b7
am: 53f46128a0

Change-Id: I5ae2ed05ffd2bc2c73bed7c4e223ab1cbd24c870