leftover from old patch

Change-Id: Id9902f2a9c598dc9a9beca9c08081e890f195552
Merge "leftover from old patch" into kitkat