These trigger asserts that were added in previous commit.

Change-Id: I78f0768c0dc9e035f3bff633560be936a2a1e487