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

Change-Id: I36e4e8c1a4de09bae0a33bdd401ce3ee3467bce9