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

Change-Id: I91bce7a26df4532d6926910885171249e6336a5f