Merge "msm_shared: support new version of the DT index table"