Merge "Allow using reserved package IDs" into pi-dev
am: 13588dc9e4

Change-Id: If17488c1194560fce69a9bedeb1553795d415c30