Manifest: WTF? remove derp!

Change-Id: I23009c4048cbd286d2090548d10e803b01af5eaa
Merge PAC-man/pac-5.0 into pac-5.0

Change-Id: I57b594a1ec64defc49bc02c6bba2f5510d72d679