Merge "[DO NOT MERGE] Fix layout for errorprone build" into sc-dev