Merge pull request #3490 from ussuri/cde-polymer-designer

Manually merge forgotten Polymer Designer-related manifest changes