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

Change-Id: I8af478fbc7eb8c62142769cd0f23a33cb3c821c3