Merge "Use 2-param constructor for HeaderItem." into lmp-mr1-dev