Merge "Remove the load_keys function" am: 64ceace44f am: ac9d4ae1bf
am: 23b832fd1d

Change-Id: Ie9c793059b6e6763dd9af014624222b3faaf0e5b