Merge "Relax access on deprecated fields for compatibility." into lmp-mr1-dev