[#1112] Update platform and polymer
Merge pull request #1153 from ScottDowne/t1112

[#1112] Update platform and polymer