Resolve big obj before controller is instantiated

Change-Id: I41754b44aa4bdd0211b69e4a297db46fe65d6ccf
Merge "Resolve big obj before controller is instantiated"