Retain compatibility with earlier behavior. Fixes bug 8685941. Change-Id: Ida800a2476ba3a18cd97deccbc65c8a02739d118