Fix inconsistency between init and @PostConstruct injection (#14613)

Change-Id: I7890d712eb1d9cf35fb0d0ef7a1a92b9bd21b67b