Merge "Remove/Cleanup Obselete References" into oc-dev am: 693aa74db1
am: 8dfcec80d1

Change-Id: I01a5eb9bdcadf4e6e0b02bb52eb9744582fc702e