Merge "Obtain entropy later in crypto operations, when possible." into mnc-dev