Merge "Update SMS list" am: 0aa93fca29 am: 9f9317bbcb am: 46312f3cb3
am: 25c7b0b4a1

Change-Id: Id290f1d81a870280c3a3175644e7625b5bab2870