Merge "Add timestamp and read status extras to MAP Client message broadcasts"
am: fd8353c19f

Change-Id: If66158d8534254cf4015144a5256a6f080598045