Merge "Add timestamp and read status extra constants to MAP Client"