Update Flow bug 70137 backport

Change-Id: Ibbf288186d796ac7c9f9c07c72ed2554c3c2da8c
Merge "Update Flow bug 70137 backport" into wmf/1.24wmf19