Merge "split LightRefBase out of RefBase" into oc-dev am: ed6aad1cbb
am: 15b290bf7b

Change-Id: I7b26f9285534be125a901039815c80f810747a41