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

Change-Id: I8370cbd9c82aab84bd67e27dc66738047507c719