Merge "Make init builtin command installkey respect property updates" am: cf29755e28
am: e58af94ba8

Change-Id: I701d0e1cd26dc3491e8b01051f5fbb91611a2545