am 2dcb5511: am c93c30a4: am e54acd41: Merge "Fix build break from unnecessary assert."

* commit '2dcb55110e15c29fca79ae7406486ef83c2a27e6':