Merge "Cleanup code and documentation for SMS EF records" am: e27d58f0cd am: 443c2e678c am: 952b58ef7f

Change-Id: I815802532da085d88336a602e1578c715c543f33