am 0f1a2253: (-s ours) Merge "Fix RS doc build DO NOT MERGE" into lmp-mr1-ub-dev

* commit '0f1a2253ae4b02ee57f81ce7a8c0db7481336915':
  Fix RS doc build DO NOT MERGE