Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev