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

Change-Id: I123472b4c8cd8fb89d7df1fecc152d571466f95e