Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am: dea7aa0da1
am: 3aa1952e5c

Change-Id: I0cacc3e9824e580cd8902b15bc28439f79993bd8