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

Change-Id: Id153b0cf7fe6d3093f6bd1aa380599d263c7213b