Merge "Set updated system package's mExtra"