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

Change-Id: I7e53ef44d77c6f0260ab2f4b42492db08c85f223