Merge "Fix NullPointerException when getting secret key"