Merge "Remove com.android.okhttp.... classes from light grey list"