Merge "liblp: Auto-suffix group names." am: eb1213f170
am: 37bcb64b7e

Change-Id: I32c826aa77912e39a26f1df45c521e62804a3404