Update manifests

Change-Id: Ieaa5103579517666db41aec9c2c74d0c3c1a5c28