Stop trying to return a void value...

Change-Id: Ie8776914b9e740de3d6b61c7cd933791f522a626
Merge "Stop trying to return a void value..."