Merge "Update platform files to 2017c"
am: 57c6cf420d

Change-Id: I03239fe5bd1b1f1e5cad48661b6356942a0ea91f