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

Change-Id: I12d85f17def51bf7047dd664b941ea1cdb2bfc92