Merge "Revert noindex-category change from change I233ce58fd82a1dbc57b3ab58ce669b23a5...