Merged a few things from namidairo (1/2)

Change-Id: I0e49dd3f4ed261e9b2874327e4b97854b0ec7634