Closed metalefty closed 4 years ago
Cherry-pick missing part from master.
Merging because it's a trivial change on snap package.
Cherry-pick missing part from master.