Merge "Null annotations for java.lang.ThreadLocal"