amami: merge Sony 4.4.2 change

Change-Id: Ic23f3bcbcb22d014b13792a9aaac64036e71686f