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

Change-Id: I7469041bfbbde9f533fdcd4e5f39d8dff94c0aad