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

Change-Id: Ibb8a510f057557e017ee29ce16ccf33e36a27a8d