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

* commit 'f7b9e4bbd5b9315019831c373165760f8dfcb8de':

Change-Id: Ia65bf91b10a563e37f8ad4201e4a7791b0e61732