Merge 15.4.A.1.9 Sony kernel

Change-Id: I0123a8adaaba2097e8006e3444198eafa6a765c4