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

Change-Id: Ie976eb317714023fd56bced28fb605691ce4a7b3