Adding verification for short flow reason.

Change-Id: I727a3e91cfe9c77351278d7eabce918f73670e46
(cherry picked from commit 3dc6432db0d077e0fe77d25422c23823cca8d885)
Merge "Adding verification for short flow reason." into R1.10