Custom packages set

Change-Id: I28bcd51448683f559f643f3ee8ad474096abba8a
Custom packages

Change-Id: I2e030121409d51e858612d6c194d776576dd6564
Revert "Custom packages set"

This reverts commit 3e027db88f7353d4165f6965216159ca85da577d.