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

Change-Id: I67d83bf885d8ee843ad958a2a1d31af9debccbf0