Bug 3439569 Lazy initialization code was not back-ported. Change-Id: I9815f649891e2ddc602383488749144686ab1dd3