Argh, a wrong rebase set weight back to 40...

Change-Id: If2419978fc80281e08f2b6f39a8beec79b65ade8
Merge "Argh, a wrong rebase set weight back to 40..." into production