Merge "Store the device initializer componentname in addition to package."