Merge "Stop attempting to read /d/sync" am: 8c5dd6de2c am: 1685c26570
am: 1d3a9c1b81

Change-Id: If6d7e67f95590bc5dc7d36027d8ab0e5947a70b2