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

Change-Id: Iabcad86121f0d40862588ff4f46fabb3dc1a08f2