Merge "Add gradient clock to AOD/LS behind LS flag"