Merge "Delete pointer sized fields" into lmp-mr1-dev