Fixes failing DCHECK. (cherry picked from commit ef76c3fa) Bug: 22553459 Change-Id: I6fe1012f9a5f8d29cb98bf25e3a279da51c5e1c0