Merge "Fix parsing bug that affects reading back guest restrictions" into lmp-mr1-dev