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

Change-Id: I8f513bf77945fd6939bac9303fb814c03f04c24d