Merge "Prevent proguard from pruning ClockSetting" into tm-qpr-dev