Merge account validator and sync.

Change-Id: Ib2d52e594d0c30fd319f8941ed42086a390646b0
4 files changed