Merge commit '681f327e839a40a4d55d3567af341b9e90f62378' * commit '681f327e839a40a4d55d3567af341b9e90f62378': Fix retaining of granted permissions when updating of system app.
Merge commit '681f327e839a40a4d55d3567af341b9e90f62378' * commit '681f327e839a40a4d55d3567af341b9e90f62378': Fix retaining of granted permissions when updating of system app.