Added more SVG work.

Change-Id: I14b82b46c3174b27cc3aa178656d5f96ca704934