Merge "DO NOT MERGE ANYWHERE Allow /dev/goldfish_sync" into nyc-mr1-dev
am: fdf2530f33  -s ours

Change-Id: Ibf9304345439ddf50d19726e184e8ff714748004