Merge "Fix getIndex impl to return mIndex" into sc-dev