Merge "Create a wrapper class for update package" am: ba9965199a
am: d4f28312dc

Change-Id: I737fdd08ceea35db4158532cfa3a8a01fe5dbba7