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

* commit '53ec5d4fb1dcda4364d70de656d047b8953a79c3':