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

Change-Id: Ifc4ce43769a244d1abf036bd6f4b0af7c6e0075b