amend: Fix review comments including fixing deprecated methods and replacing time related magic numbers with constants from TimeUtil. Change-Id: Icfba755630a09253a1c6bf152be1e52e4363c1b8 Former-commit-id: 12d82e8bf851dad82b548b4cfdcc0755ace33678
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
Former-commit-id: 64fa9254b946eae7e61bbc3f513b7c3696c4f54f