Manifest clean

Change-Id: I733deb7e2d5584292a8cb442a32aad38c6b1544f