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

Change-Id: I7f067b007a32506f5a582c7fa4799e23e3e2a598