am 5b065655: am 48b13a58: am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '5b0656556a085cbf4e7f17f4dfa8863a022f8e11':
  Keymaster digest/padding NONE no longer means ANY.