This is in ldpi-common

Change-Id: I6507837e413bf504ed175f6124b79c3d14ff3737