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

Change-Id: I802a1ecd1ff23e15860ed03e22491476aec2d3ed