Merge "Merge "Remove unused library framework-oahl-backward-compatibility" am: 2111aeb289 am: 6581b4116b am: 14e472690a"