Merge "Remove assert, use CHECK instead." am: 5d6d932a60 am: a520b8baa8
am: fc04d39ab5

Change-Id: Ifae83c8dd425b554b948b7b25edffc9e8981f2bf