Merge "Remove the load_keys function"
am: 64ceace44f

Change-Id: I237dfde12e8597c36463ca31e487bf36b0d13ea1