Merge "Move OneTimeInitializer to /product" am: 506fc0422e
am: ade6480abc

Change-Id: Ie0935da7024a3c13de7fa16214bc0898351c3627