Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: 3485e31072
am: 1f1970c143  -s ours

Change-Id: I30f1310fec1b0a5d345d6f0750f7008ca3084850