Manifest updates

Change-Id: I904921e448fd5d01b32d0e58fd71d72eb87bf35b