am 412dd546: am 53ec5d4f: (-s ours) am ffcf8047: Merge "Backport Java 8 compile time break workaround."

* commit '412dd546124fc15a0a6236f0cd2077273ca30a70':