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

Change-Id: I5ed89883d2bfaddc7e26c16abcb8a111776ee62b