Updated packaging.

Change-Id: I399f36bbe945ab0316d55cfda215c097f9b17af6