Merge "Fixed the issue Possible to crate duplicate label/group." am: 3ba72351ae am: e88a20f4cf
am: 07ac6cb9a1

Change-Id: I8522e5d79fa37f717909a9b739d086ae28127218