Merge "Rename email extra to email bundle key." into lmp-dev