Merge "msm_shared: bam: Add support for cached descriptors."