This already is in ldpi-common

Change-Id: I3cb8da913505e1ac5be36e23ecfc7d6a41a9221e