Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e7e am: 6ef5b6c183
am: 4e16f07ddf

Change-Id: I0e8a4e7cbe1bfc34f03b57256f6eed48f56ccdcc