Merge "Fixed the historic messaging experience" into pi-dev
am: e12f7fffcf

Change-Id: I4eee4a2a5d1b3941d15a7b9d0a14c6441415d10e