Merge "Do not add permission while cleaning permissions state"