Fix problems with wiring of initializing calls (1/2)

Bug: 16993846
Change-Id: I3ed4dd30559511f51b3650bf99bd704ae73d2165
1 file changed