Merge "Revert "[LayerTraceGenerator] fix mirrors and rel-z data"" into udc-dev