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

Change-Id: I819d57dbc1d299b392fb9d3e25814ed1aeb046a7