fix for cm-11.0

Change-Id: Ibce895b6938489a751eaf8a3d678987062cbc45c