Merge "Add proper namespace to GraphicTypes." into pi-dev
am: 92f8d8b1f3

Change-Id: I89576d58a23acab7efa25864631663e203656baa