Merge changes from topic "liblp_test_static_rename"
am: 8d0c132ab9

Change-Id: Icca40abffe60cd4b634be703b61d34048533fe21