am 974233a1: am fa610339: Merge changes Ia3732dc4,I47cad3c2

* commit '974233a16dc3964f74e4e9daaca8982aacd9e3cc':
  Check and normalize defines during import
  Remove ripemd