Merge "Updated Samples metadata for April push of samples" into klp-docs