Updating CN to head to fix bug

Change-Id: I98d19b4277c7a403e9335b4f9721f4d0bfef3dd6