am c2e8f144: am da77cee9: Merge "Fix sample info parsing" into jb-mr2-dev

* commit 'c2e8f144db456b1612ea95893b17ddc3cdb2e844':
  Fix sample info parsing