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

Change-Id: Ic7d2192bf1b27a214b4a3d1d5d52e74004fd64d5