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

Change-Id: I5360c4741789fccb4b8e38e970db39bdc31613bf