(or does the comment need to go exactly at the line before the one containing
the "return" token?)

Change-Id: I5f92e59ee05d0b5ba3d6bda775e6ca02f185dbe8