am: df4bb31b * commit 'df4bb31b': Revert "Instrumentation to handle account syncing" Change-Id: I19e2b2c34d3cc58792662c3bad293f21457f2ddf