Fix docstring ordering

Change-Id: I24e377c13ef7342329ab91925c766c05d5612b5f
Closes-Bug: bug 1287107
Merge "Fix docstring ordering"