Merge "Shorten month on AOD date" into rvc-d1-dev