Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7 am: a28de3b8 am: 220aadbf am: ec36ab27 Change-Id: I1d239d231b71f597907895de0903c2990001887c