Merge "Avoid background getTotalTimeLocked misreporting" into oc-dev am: 6029bce3b4
am: 0fcadeaeb9

Change-Id: Ieb7b6cd5299bab7f10c84f78e8ae1472988cff60