Merge changes from topic "liblp-blocksize" am: d0e5bcc13f am: 0bade5b848 am: 976d4ec67f
am: 9d77f7495c

Change-Id: I2d9101013d914d9510fecd6cd6401a1cc8500441