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

Change-Id: I3c8bf903f0149d0e58f697320b9311b9460e554f