honami: merge Sony 4.4.2 changes

Change-Id: I0c4d5129164cab17877b412595bdc076cd25afff