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

Change-Id: I4193a4f3f6b10d41c4ae3049d6d9267fc9daa778