Merge "Fix incorrect descriptions under SMS contract" am: 8f48cb7e am: 6ef5b6c1 am: 4e16f07d am: ecd1d675 am: b6d51f11 Change-Id: I7ca8d0dd5068f190cda7f4ccb85110b6b74f51b8