Merge "Replace dynamic assertion with a static one."
am: 67b77abfbc

Change-Id: I352b87f078a98cbec379850c6d23a4c460b33460