Custom packages set

Change-Id: I28bcd51448683f559f643f3ee8ad474096abba8a