MT#7141 upgrade package to 3.0 style

Change-Id: Ice530450722b394ed25a7685fe488c18e301be3b