Merge "Reverse update accounts logic" into oc-dev
am: c63010e7c0

Change-Id: Ic256f2620b115899cea2d3f309a1ea4b17b3d1e6