Merge "Make init builtin command installkey respect property updates" into oc-dev
am: 78a215ff55

Change-Id: I79ab23c6a1d22054ec81c78309be5849133e5eb2