Support for placeholder selectors (#11685)

This change does not perform further simplification of
selectors.

Change-Id: If0126afba232617a425a24faf000f6d429969e11