am 67d10b46: merge in klp-dev history after reset to master

* commit '67d10b46e3cb26703abc5312930adf79b1ad634c':
  Fix dev branch Build ID
  "KRS38B"