Merge "Deprecate option for bug 1932026"