Manifest clean up and reupload

Change-Id: Ie075976d05f44bdc344c537666523b3ff4a2183c