Use my Manifest

Change-Id: I27a9b6f84128520f3505df66da8dd4ed3e7c06d7