This can be done with Java8 Date now and the dependency is no longer needed. Change-Id: Ia87e943c2321be09dad7347a3d582815b9ced53c