Merge "Add APIs for better interoperability with Java 1.7"