Merge "Activate l2switch verify with JDK8"