Merge "Merge "docs:  replaced "i.e." to fix formatting error" into oc-dev am: 0580ac8a65 am: 1e6401b07e" into oc-dr1-dev-plus-aosp
am: a54ab7edf4

Change-Id: I0350cf5af828990539d0fa9ec925feef54348a49