Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev
am: fb2cdce7c2

Change-Id: Ib97afbd6e74bc4b35cd6a5014815c3f801078413