Merge "Add self to owners for SystemConfig.java"