am 609a8d18: Merge "Fix memory leak in setActionProvider() - support edition" into lmp-mr1-ub-dev

* commit '609a8d182fc5b5a81cf7c9bfb3f93d885873aa00':
  Fix memory leak in setActionProvider() - support edition