More honami related stuff

Change from Mightbear to CM to see if funk is exercised

Change-Id: Icdf1c8ae155c12416791cd9f3d91cb74e904ba23