Merge "Merge "Fixing bug in UsageGraph rendering." into oc-dr1-dev am: 8fd9c28b7e am: e9216ccbd3" into oc-mr1-dev-plus-aosp
am: 8bc726d770

Change-Id: If4a740fbd056f88937dbd32a468baab542ff959c