Change wording of short description

It's important to keep the language very specific for trademark reasons.

Change-Id: I147d0c56339099bb0bd602700fe57b67975efc36
Merge "Change wording of short description"