stop the green leak

Change-Id: I0177b409dbbec530c74b51d59448cddf4363b4e1
Merge tag 'android-4.4.4_r2' into HEAD

Change-Id: Ibc1866cb0f82610ff5740d650e17505fb97e16c6