Merge "catchup the gingerbread branch to gingerbread-docs for all sdk docs" into gingerbread