This reverts commit 91ba6c7e. Reason for revert: Relanding Java 17 Change-Id: I6d0e64bb86b9f4a0f41baa33c3226c6316718456