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

Change-Id: I5f70c8eb738cad4aef9c56a764ee2bebeff46852