Merge "Update docs to reflect correct time units" into mnc-dev