Closes-Bug: #1399545 - Reverted to the original labels.

Change-Id: Ic0cfcf45c5774fe6788cd4811a230450c2d39c2d
Merge "Closes-Bug: #1399545 - Reverted to the original labels."