Merge "Systrace doc updates" into klp-docs