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

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