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

Change-Id: I22231b3f8e51bdca1d2c5e79c17b764bd96ab5e9