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

Change-Id: I1010ddc882c458dfe76f40bea4632919202ecf23