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

Change-Id: I50be838e9f0f9e794389f6d24a5e699d7f163caf