S999: Make maven happy again

Change-Id: I1659f677fdb8129d86ff2eaeb448a53408428a9c