Merge "Add a graphics owner for graphics.h." am: 3303c5d520 am: ca8ffc893b
am: a82f7a0fe5

Change-Id: I39ba58ee9d74781897bcc55cc34e624cee389b1f