Merge "update message expiration time to 6 min for KDDI"