Fix after android 4.4.3 merge

Change-Id: I4ee721b9a5fa7adbfc876837b481c2d419aa18aa