Merge "Revert "Revert "Assert that digest/padding NONE doesn't mean ANY.""" into mnc-dev