Sync, not merge, because we reverted the previous merge and now
git/gerrit are not being helpful.

Bug: b/63388215
Test: It Works For Me(tm)
Change-Id: Icaa46c0e44b9799bfa102e183d1091838a9a061c