Don't reference pillars before assigned

Change-Id: I9beb360a7059595c0b9f4cc075df3b72cd3912f9
Merge "Don't reference pillars before assigned" into production