Merge "Merge "DispSync: Actually wait forever" into nyc-dev am: 8a56bb70 am: d9718276" into nyc-mr1-dev-plus-aosp