Merge "Increase the duration allowed for a TC result." into oc-mr1-dev
am: f85cd339c7

Change-Id: Idc9022fa7054fa70b1599910f23c2cce8714f321