Change some IDs to fix the build

The doc tools 0.20 bring a new way of handling the IDs, so we need to
update some references names.

Change-Id: I169ab871534f504744482e562db3ab13194a6699
Merge "Change some IDs to fix the build"