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

Change-Id: I59c1fca233afa8c26423be7a437f560456b0a48b