Merge tag 'fortglx/4.19/time-part2' of https://git.linaro.org/people/john.stultz...