Merge changes from topic 'upgrade-junit4.12' am: 7cfdf040fd am: 535e14398f
am: 5711c1a80f

Change-Id: I7fc6019deadb6251db8243cf2862d39701054120