Merge "TEST: Fix Broken Java unit tests"
am: 05ef0b4879

Change-Id: Ie9dda36b120c8dbf935b057cb990af87331a24b6