Merge "Revert "Throwable: Revert unneeded changes from upstream 8u121-b13""