"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
am: 8a05cda  -s ours

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

Change-Id: Ida61f3ba3d91a67185cb06411251dea62d8eedc4