Merge "Remove hamcrest-integration" am: f1015b50e7 am: 013fc08d6f am: 43a62f7d24
am: 5f28c864e2

Change-Id: Ief544f8a11b0909718a6835ca7fe16328cf42ded