Merge changes from topic 'upgrade-hamcrest-to-2.0' am: f324aac9e2 am: 0d446c0a6f
am: c2e228b07b

Change-Id: I737b987a8b22811c7ea058bcd9898b58694b58ce