Use my manifest

Change-Id: I526dbd13ba51798df44de7a06ec3d66cc0eb5467