Merge "Reset placeholder count when rebuilding resolver list." into rvc-dev am: 4ae2732361

Change-Id: Ic7588581f1a0139dfc896552437bed21564702fb