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

Change-Id: I3f85b106b6ac1e342db17fd9003422464aeb499f