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

Change-Id: I7617577dd4fc8dc0944deb76e95142f96dade2a7