Merge "DO NOT MERGE Stop work challenge freeform bypass" into nyc-dev am: fb2cdce7c2 am: a28de3b8c5 am: 220aadbf9f am: ec36ab27cf
am: 1246772f88  -s ours

Change-Id: Iacb1e04de80ce05137da5098de35b94a0b6aafe4