Merge "Accept an optional PACKAGING env parameter."