Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e am: b76fe783e0
am: 5252372c15

Change-Id: I9ec7bf6f03d0c08b77db145abdbc1557beaa30aa