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

Change-Id: I9988a9c3187b4da654d09e1fe41006efc604e32c