N4 updates to manifest 2

Change-Id: I2acc819ea4387db099aec90107ccd3228b198054