Tweaks to object hiearchy diagrams

Change-Id: Ib2ff6e548c9e31cdaf5d8606e7e9babe20d9cb5d
Merge "Tweaks to object hiearchy diagrams"