Merge "Stop using junit classes in production" am: f1ec8df547
am: d382e794e9

Change-Id: I43e1638614a6076b0a664352367adce76cf80787