am ef0a019e: Merge "Change data to currentTimeMillis" into ub-gmail-ur14-dev

* commit 'ef0a019e51a7e3d645cf662e87de0d671b440185':
  Change data to currentTimeMillis