Java. Convert to use of these new methods where possible. Create unit tests.
Change-Id: Ib21dc7e92eb7324dba79d128d785ced58aaeae2d
Former-commit-id: c17f8b4409 [formerly 0b6b0e06cc] [formerly c17f8b4409 [formerly 0b6b0e06cc] [formerly 40b5d54bf3 [formerly 5992197809236553e9c021526e42d28ed327b413]]]
Former-commit-id: 40b5d54bf3
Former-commit-id: 9c656c28b9 [formerly 8d347252d2]
Former-commit-id: f46f62ff2e