Merged a few things from namidairo (2/2)

Change-Id: I2802b724f17718535953cecca987565fdf4a1e70