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

Change-Id: I7ca8d0dd5068f190cda7f4ccb85110b6b74f51b8