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

Change-Id: I194e5657b524da266e11398dbf93794c76efbdba