Merge "Make test work when running ndebug."
am: 3469575a63

Change-Id: I7280780d2580ad9a3dc1ca78e5399a26730263ec