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

Change-Id: I36ab66d1ce3992c0dacf73f56ea7d92cdc56ae52