Do not return anything on __construct

Change-Id: I47f67ed17112af832b19f7e7538cae3e0b8354ef
Merge "Do not return anything on __construct"