Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am: dea7aa0da1
am: 1f358b11ae

Change-Id: Idaf93ee269522d0a37b424d5360a7505484cdbf7