Merge "Stop attempting to read /d/sync"
am: 8c5dd6de2c

Change-Id: Idc539f15955850a49f6bc1757c2443bbededfebf