[automerger skipped] Merge "Add proper namespace to GraphicTypes." into pi-dev am: 92f8d8b1f3
am: 1f921b59f1  -s ours

Change-Id: I7222299e338bb5a6632846c7b6d8992a2a0d80f9