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

Change-Id: I0f963575382038afd889f5af666b1071583c8117