Fix compilation error on launchpad

Change-Id: Ibd26710b0ca09f65695b7db8046aba67091bd5b2
Prepare release 4.3.1

Change-Id: Ifd5e01c0528a5e4895613d62c3c72bb1555db7e4