Additional changes to "upgrade to Polymer 0.11.0"
Merge pull request #2696 from ussuri/polymer-0.11.0

Additional changes to upgrade to Polymer 0.11.0