Removing display-name and display-description from v2 samples

These are deprecated, so users should be using name and description
instead.

Change-Id: I7086c61d454f13cac82c4da1c2c25bcb1f88cf96
Merge "Removing display-name and display-description from v2 samples"