Bug853468graphicsdevices

@selenamarie r? NOTE: I will rebase and merge.