Merge "Clarify time unit for StrongAuthTimeout APIs" into oc-dev