Merge "Docs: Almost final Cleanup CL. am: c24d43800a am: 0e2a66c9fe" into qt-r1-dev-plus-aosp
am: e151ea4118

Change-Id: Ia26998e8a3bd3701b0d307f7d53bb80d95aa9e0b