Merge "Remove hamcrest-integration" am: f1015b50e7
am: 013fc08d6f

Change-Id: Ia03060046a3bd4e39947c37afa96e9642605ce23