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

Change-Id: I8b84b8a48415cf416f124a8572401521c0ea796d