use date helper

Change-Id: Ic0abc697ce378c3c13d8d4ddf1c70f1bc740a7f5