Consolidate all UPF docs in the same file

Change-Id: I4f94ce90cd99c0eebee7952273da590495817975
2 files changed