Merge "Docs: Complications additions and changes" into nyc-dev
am: 754dfad475

Change-Id: I49c2afe09db10f72f838ef59f935231570930569