Move ending of one line docstrings to the same line

Change-Id: Ibd25dfa2cfbdec3b5cf7a44047a304fda2bd0eb9
Merge "Move ending of one line docstrings to the same line"