Merge "Update SMS list"
am: 0aa93fca29

Change-Id: I6fde6c7b7cc04a236dded33d09afed83f89e197f