stop the green leak

Change-Id: I0177b409dbbec530c74b51d59448cddf4363b4e1
Merge remote-tracking branch 'upstream/kk4.4' into kk4.4-mo4