"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours am: daa8d67 am: 5eee2cd am: 48115bb  -s ours am: e2dca1a am: 63bcffd
am: c522820

* commit 'c5228202951c7bc4e52efa5fc37aded7a3447347':
  "DO NOT MERGE" Add write SMS protection

Change-Id: I040910aa52e542acad0fffda4ae4ff5dad101008