Merge "Remove root permission requirement"