resolve conflicts cherry-pickin
windows8 update platform init
windows8 update compass
windows8 update device proxy
windows8 update filetransfer proxy