Merge changes from topic "liblp-blocksize"
am: d0e5bcc13f

Change-Id: I95e14110705740db955800fc05ff9b1371226cc1