Merge "Merge "Push empty sync transaction before taking screenshot in tests" into nyc-dev am: 08588dd760 am: 46e5b65075" into nyc-mr1-dev-plus-aosp