Merge "Merge "Remove unused library framework-oahl-backward-compatibility" am: 2111aeb2 am: 6581b411 am: 14e47269"