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

Change-Id: I0603d46735c07da7628fc605b7aaec22b06f45eb