Merge "Migration to use MD-SAL Project"