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

Change-Id: I602eafce4122063c07e6ff09f61f5ca43f47a0f4