Fix previous commit (reportdesign part, following)

Change-Id: Ib55bdc21fa6081c55777465115538905c1cab5e0