Merge "Fix the description in string.xml" am: d2df1d5055 am: c02d8a680e am: 7512b26f8b am: e0e3f8f2c5 am: e3b879070b

Change-Id: I953f76ea333e6af2d1e0ec78c40078788f0a9da8