Adding verification for short flow reason.

Change-Id: I727a3e91cfe9c77351278d7eabce918f73670e46
Merge "Adding verification for short flow reason."