"DO NOT MERGE" Add write SMS protection am: fd7a794  -s ours
am: daa8d67

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

Change-Id: Ia8f55d6ba4a5d008b107673d8830208c3eefd30a