am 38f1aed0: am dcc645eb: am dd00a967: Merge "Revert the revert. (its time to sign MR1)" into klp-dev

* commit '38f1aed01d7bfeba6368d321f1233fa2b7903cb5':
  Revert the revert. (its time to sign MR1)