cherry pick https://github.com/Polymer/core-list/pull/44