Remove use of junit.framework.Assert in non-test code am: 2728397759
am: 57fc9514a7

Change-Id: Ic26080d733768d511e4c9300daa7897aa45b9a99