Fix docstring ordering

Change-Id: I24e377c13ef7342329ab91925c766c05d5612b5f
Closes-Bug: bug 1287107
Updated from global requirements

Change-Id: I1507d3013597e4fbdf8348504f9959d132fc6569
Merge "Fix docstring ordering"
Merge "Updated from global requirements"