Merge "Update proprietary blobs for manta" into klp-dev