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

Change-Id: I07592e3ffa7e56085d274436e2e28cba54ca05ac