Merge "AOD/LS - RTL adjustments"