Merge "Merge "SF: Force empty sync transactions to apply anyway" into nyc-dev am: 7443c1f253 am: 424d8325fe" into nyc-mr1-dev-plus-aosp