Merge "Guardrail for dimension in condition in duration tracker." into pi-dev
am: 014432cb67

Change-Id: I5801bf467d7635208b5ed93fa17b6f10fac81de1