If namespace doesn't have a weight default to .2

Bug: 62056
Change-Id: I8d1c7aa09759be57bcc4f9a8221a8c28db417143
Remove some pointless else statements

Change-Id: I86df863df4c863a7c60944b483ae50a36ea34fff
Merge "If namespace doesn't have a weight default to .2"
Merge "Remove some pointless else statements"