Merge "Make init builtin command installkey respect property updates" am: cf29755e28 am: e58af94ba8 am: 32d30011f5
am: 1b8715541f

Change-Id: Ie318a962c36498d4870601223660053e0415612f