Make button text more concise

Change-Id: Ie6ce804c16c33b65cc7a7642e766922f800f92e3
Merge "Make button text more concise"