Merge \"Selecting uninstall button based on text\" into nyc-dev
am: 5df6b6b399

Change-Id: I026add721b1cedbb89d5ab08e5abeebbb437af4a