Merge "Block modification to ID and package name" into oc-dev
am: 3be230a48b

Change-Id: Ia1479270eab980b4d43a4b3a4a7ed8274e41bc5e