Merge changes from topic 'upgrade-hamcrest-to-2.0'
am: a565149246

Change-Id: I07fbfb874b63dda6e1c2ebf19c75cff709059779