Make master API compatible with unstable API
Make master API compatible with unstable API

Change-Id: Ic344f6df30e8f55bf85abdae4ca57799360bb45c

jchris/indexing,jchris/indexing,jchris/indexing,jchris/indexing