Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev