am 13d0294d: am e9c2395f: am f2fbb21d: am ecff92d9: resolved conflicts for merge of 79a55d35 to klp-ub-dev

* commit '13d0294d2dfdfcdf93247ff41fa52b9af1475406':
  add Analytics event to track sample downloads (for real this time)