Merge "DCB whitelist short code for user association"
am: 722282ec62

Change-Id: Id8c380c715a94336cd21af4b6a3e3ae9da11a1e1