Merge "Move comments to the previous line" am: 906a3ea5d6 am: 8fb3f39bcd
am: 96c28f9670  -s ours

Change-Id: I07a4da68abe05d5d7779a3f022a13bf1eed40a21