Merge "Merge "Docs: fixed variables" into pi-dev am: 116158689c" into pi-dev-plus-aosp