Merge "Remove unnecessary/erroneous reference counting" into lmp-mr1-dev