Merge "Remove the custom clock from LS during transition from AOD" into qt-r1-dev