per bug 142000. Thanks Steffen Salbert for the patch Change-Id: I592f14616a217b2d5a3403573b14c491e49b143f