cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9

Conflicts:

	docs/html/sdk/sdk_toc.cs

Change-Id: Iaaa7fc01504400e7c57955a1ee94f005d1dba056
2 files changed