Merge "Fix a few issues in synchronization tests" into nyc-dev
authorDavid Sodman <dsodman@google.com>
Thu, 14 Apr 2016 18:07:22 +0000 (18:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 14 Apr 2016 18:07:22 +0000 (18:07 +0000)

Trivial merge