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

* commit 'aae778ac554257a7aeeb4db2ddec5bacad10d458':
  Change data to currentTimeMillis