Update Flow with two backports

Ic576481b12 Separate lock reason from summary
I2f8d69730b Duplicated topics are returned

Change-Id: I086cbb986d218389309122bda851abc90c783f96
Merge "Update Flow with two backports" into wmf/1.25wmf2