am 23f9bb62: am cd1255d1: am 4362d331: resolved conflicts for merge of 6da9c2ed to klp-ub-dev

* commit '23f9bb62da2c1b8257ea656c0b14c2e0fca9648b':
  Updating build metadata for march sample push.