Add .weight again, as a constant

.weight is a mandatory parameter

Change-Id: Ief0d934501d4d40cfb7c07f6d5520735631b1cc9
Merge "Add .weight again, as a constant" into production