Merge "Update manifest to account for new startup library"