This version fixes manifest validation [0], so a couple invalid manifests are fixed in this patchset as well. [0]: 32d7f1a3fc Change-Id: I0cbdf21cf016271bef2d8a541687ce3ab28081ce
32d7f1a3fc