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

Change-Id: Ic5fb12f67a5dd7eba52b853d3516fbf41b5e54af